Fixed small not-blocking bugs in main html