Activity model, tests, bug fixes and Bootstrap 3