Fixed reload on orientation change; Restructured menu; Cleaned up code