Minor UI Refactor. Filing issue on UI