UI Updates

Working on UI