General UI Updates && Added Dropdowns