Fix/refactor css