Improved the front-end side of the interface