Fixes selected menu bug; Adds a few minor improvments