UI Adjustments, Part 3

DO NOT MERGE