sidebar fixes + more hotswapping