Better startup checking
Fixed scan trigger bug with new topbar