Complete CSS refactor + fixes