A lot of UI changes; mostly buttons