Code cleanup.
Adjusted UI constraints.