Changed icons, moved button bar to top. Adjusted views