Styling overhaul #294