Update with better stylings - still a work in progress.