messed with layout a bit