Styling Fixes & Minor Performance Fixes