Use proper mountable layout