Updated layout, almost complete