Added new layout more flexible