Fixing CSS Bugs
More-bile optimization