Cleaning up master web UI
Some comments