Modified layout, added new views