Did more work on the UI improvements