Fix css and better the code