Refactoring frontend

If you need this, use it, otherwise delete it