Greatly improved frontend
Merge pull request #1 from darkness3560/master

Greatly improved frontend