Fixes # 5, fixes #24, added Pokemon icon to form, fixed other bugs