Added functionality and UI