Made some major UI changes