restyling - not ready
#129 First attempt - Not quite happy with it yet