refactor on layout
css cleanup