Add badge controllers
Resolve conflicts
Delete SCSS