layout overhaul shortening code