Fix bugs as per colorscreen and startscreen.pdfs