UI Changes - tweaks to buttons and scrolling