Started adapting the normal-layout to the styles
Further styles added to Large and Normal layouts

The layouts now refer almost exclusively to styles, so changes can be applied to the styles
and they will be applied widely, instead of having to hunt down and make a change to every
layout in every size for every activity.
Further tweaking of the styles