Updated viewport styles and rearranged stuff