Rework menu and use better colors