Started implementation of new layout