Fix more main.vue logic errors
Fix more main.vue logic errors

Again seems to have been introduced in conflict resolution,
pesky duplicated sections and too many brackets to line up. :(

lyw07/kolibri,jonboiser/kolibri,66eli77/kolibri,aronasorman/kolibri,mrpau/kolibri,66eli77/kolibri,benjaoming/kolibri,jonboiser/kolibri,learningequality/kolibri,christianmemije/kolibri,ralphiee22/kolibri,mrpau/kolibri,jtamiace/kolibri,jamalex/kolibri,whitzhu/kolibri,jonboiser/kolibri,jamalex/kolibri,66eli77/kolibri,whitzhu/kolibri,DXCanas/kolibri,jayoshih/kolibri,DXCanas/kolibri,christianmemije/kolibri,66eli77/kolibri,DXCanas/kolibri,lyw07/kolibri,rtibbles/kolibri,benjaoming/kolibri,ralphiee22/kolibri,MingDai/kolibri,MingDai/kolibri,jonboiser/kolibri,learningequality/kolibri,mrpau/kolibri,jamalex/kolibri,christianmemije/kolibri,learningequality/kolibri,MingDai/kolibri,indirectlylit/kolibri,indirectlylit/kolibri,rtibbles/kolibri,rtibbles/kolibri,whitzhu/kolibri,benjaoming/kolibri,lyw07/kolibri,DXCanas/kolibri,learningequality/kolibri,aronasorman/kolibri,mrpau/kolibri,jtamiace/kolibri,benjaoming/kolibri,christianmemije/kolibri,lyw07/kolibri,MingDai/kolibri,whitzhu/kolibri,jtamiace/kolibri,jtamiace/kolibri,aronasorman/kolibri,jayoshih/kolibri,indirectlylit/kolibri,ralphiee22/kolibri,aronasorman/kolibri,jamalex/kolibri,rtibbles/kolibri,indirectlylit/kolibri,ralphiee22/kolibri,jayoshih/kolibri,jayoshih/kolibri