More UI Updates

Starting to take shape!