fine tunning, menu fixes