More UI Enhancements

Will upload documentation still tomorrow