Update Layout based on Chris Burnell's updates