Improved buttons a bit, more to come

Some unfinished changes