Massive style work and UI changes