Feature/7 filling in layout