Added minor theming and minor cosmetic upgrades