Added other UI elements and functionality