Deleted Barista model. Improved layout