Did more UI tweaks