Changes for new layout