Add stuff for parsing better and make GUI bit better