Made menu functionality better