Front-end improvements. Bug fixing.