Improved buttons and navigation