separated gui from logic
Minor changes and typos in messages