Updated combat UI and other combat stuff

Made the combat flow and look a little bit more organized. Also added
some error handling for stupid user input.