Updated layout a bit