CSS fix
Various fixes & optimizations