Feature/filling in layout