Layout Changes v0

start of the layout changes discussed with anthony