Minor cleanup and some fixing of start screen