Added complete layout
Hopefully works