Start compartmentalising layout component
More consolidation, prepped some specific styles for old IE