rewritten some stuff in menu \o/