WIP Fixing little things regarding the previous commit.
WIP Big refactoring of the web application.