redoing some auto layout