Menu stuff + bug fix