Re-organized code and added between-level screens