added Menu + code became more PEP8ish