layout changes
minor changes
Layout stuff
merged