Front-end improvements, fixes #3