Cleaning up layout/theme code part 2