merge autoload + css fix with main branch