-Minor fixes on front-end