Re-organizing and working on the web interface a little bit