Major UI cleanup

Major clean up of existing UI styling, and moves us closer to the new wireframes