Some work on Layout

Need to get the fixed front controller from home.