UI Adjustments, Part 2

DO NOT MERGE