more layout changes
more stylin
Merge branch 'lighter'