Some styling
Improved views
transfer to andrus