some bugfixes, and prettify buttons