Improved buttons! starting to look pretty good!