styles added + refactor
restyled