Dev Branch - UI Improvements