More GUI functionality and correct Map word check