Reworked Menu-system