Frontend
Improved functionality