Menu on the right + fixes