Assignment 5: Additional auto layout fixes.