minor refactor, more css