refactor rendering
minor style changes