Small modifications and UI