Refactored CSS, design optimizations