Replacing old layout
New layout