Major cleanup of layouts + using of resources for dimensions.