Initial commit for screen handling.
Minor fix.
Basic menu implemented
Clean up