refactor views & css