added some styling, refactored a bit