Made changes to screens, and fixed functionality.