fixes #32 and starts moving to a more aesthetic layout