Updated to layout extend  and bootstrap