Fix some bugs in the online screens