Continued breaking layout elements into separate includes.