UI update (Right Click menu) + fixes