Some modifications to UI making things a bit more clearer.