Cleaned up template, views and urls for webinterface and inserted some mockup non-functional elements mockup
fixed conflict