First steps to the new layout