Aspire graph changes + finished main page implementation
Merge remote-tracking branch 'origin/master'