Reverted layout to old