Front-end and bug fixes