Add bootstrap layout, refactor tests and routing