fixed location & menu bug