First commit of main screen
Merging badges and main screen
Fixing build