Minor Auto Layout Issues Fixed