A bit more layout work, re scalled everything back to 1, and created layout groups
Also changes to the scene