menu improvements and cleanup, broken clear button