Removed old layout, completely on the new now