Improve frontend and UI
Merging