Github integration
Cleanup of commented out code, skipping watch events, reordering the stuff on the screen