Polished more functionality and UI.