Updated functionality and UI