some more cleanups/refactoring/blahblah, some button positions may are a bit off atm. also I added a new picture for one of the buttons

(binary:image/vnd.microsoft.icon)