front-end Update

Fixed important front-end issues