UI changes pt. 2
Merged
Fix ui issues