More UI Updates

Final commit for the night