From fbd22e7b9432e4979ed593b5b44716f44c00d412 Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@nym.se>
Date: Thu, 31 Jul 2014 09:02:56 +0200
Subject: [PATCH] Rearrange settings slightly

---
 auto/gui.files.go |  2 +-
 gui/index.html    | 36 ++++++++++++++++++++----------------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/auto/gui.files.go b/auto/gui.files.go
index 27eba387a..4d20c1d2d 100644
--- a/auto/gui.files.go
+++ b/auto/gui.files.go
@@ -73,7 +73,7 @@ func init() {
 	bs, _ = ioutil.ReadAll(gr)
 	Assets["favicon.png"] = bs
 
-	bs, _ = hex.DecodeString("1f8b080000096e8800ffec7d6b7bdb3696f0f7fe0a44d38b3daf29d9499ae9ebdadaf5259dba97c48fed4cb7dba73b0f4442126a926000d08ec6f5fcf63d07e0fd225296ed7876fa21b14882c03907e70ee070efd9f1dba38b9f4f5f93b90efcf1277bcf1ce793d1881c896821f96caec9c6d12679bebdf3927c472fc5841c0a392334f4a045a8259fc45a484536146344cf19397afbe6e2ece4f0ddc5dbb37332e53edb1c627707be4f4c778a48a698bc62de90bc538c8829bcc6155122962e23aef01881cb99b86232641e992c6030f2e3c985a3f4c267d897cf5d162a1c8e6ae2c2d30923531103483c3430fc7072f4facdf96b33fcf013c701ac1039e2d370b63f60e18084338746d1fe402d4217860f67e6968b1809df67727f709e3e39d2d21f10d7a74aed0fb0912fe8e500bb64d41b7f42c85ec03425ee9c4ac5f4fe20d653e7ab41fe60ae75e4b0f731bfda1ffc97f3eec039124144359ff80cba851159086f9dbcde67de8c15de0b69c0f607579c5d4742ea42d36beee9f9bec7ae800c8eb9d802c4b9e6d477944b7db6bf33dcae75e431e54a1e692ec2425fb56634d673216b2d7c1e5ec2c4f9403178acdd5813ee624f73c9a6fb8329bdc2cb6104841c7f822f68ae7d36ce88487e27373738cf6f607edfc0481b9bb7b77b23db2a1bc0763611422b2d693472951a6557c3808743b83348e0406e5073c6b485d05c13bd880009cd3e687cd93c216422bc05b9313f0989a8e70140ce44682d825df297ede8c3d7c9b32920ed4c69c0fdc52e197ccbfc2ba6b94bc91b16b3c116c96e6c910309d4de228a86ca016ee653dbc5ed27e64fecffbff997d9880195331e3a5a44bb6467f8250b4a6d8708ac138850a8888200dc34c1f2230b7db1457e142175e12f489e12c0905b64700462c3990410af01c2ac9bca1014980db9db43b9f1c6dab0ae9663649dfa53a457fbd3294c48fbd3ac676f69cf8d4fb39ebd8c0a13213d262ded421156f0f2c54c54c8bc4bb6bf2ecf74e18ee9c6f9329ff048288e12b18b3c053279551d802bed84c299c4a014743694b96d18ce4186b3a0555e04c4fc3808b3773cae229fc25cf210789d39135fb897291cc0da5692811f53fec818c7a84d609dfcc184ba9733891a0f471112c09f4d369ebf78b5459ebfdcc6ff7636bf2e5350528fc76a97bc28209fd26727fa405ee6f753423e87dbcfd3dbb755bc80cdc2a147417154f8dc675380763b67f4127a3bdbf96dc3f9d4e733a43f22f97537ad5202a78ab84e5f9c0bf28c07a83569a81b24016c44f6daf59c6be61899c157af41d194b4c135b3d47fb9bdddd89357532c16ffe7a056baa0f0862aa0beef94a8d80a50f2f27f06cce3946c04f44342d3bfbcfa4bf46133eb20912bb0b211a80960e9b1bd5394beac3121a33f03ef83add584924cd712b0641ad5361bce86bb595bf267208a042d3301c34aa239505a81501140425c139caa8964f452a11df605bc2e592405bce3030b8e14584830e8d75ccf8b3d5a7e5243f2e75176bb420409644a67e53663c7bd911141b0c4236b8a3fd93318e2238f5f550dfaeb2bb067c6988ff746f0dcda29f076c8858840a424414701ef85f42ab3f7f40a9fd83fa886d29f1e9bd2d807b30cdd33d38ecfa831aed6e61808924e100a0ac491c933b456203de5319c8904a70a60e3c12c7d82fa6d409474d1dc3978e5ec3cffca585962bd80c18be760830d8fdadfa331c98cee9e61afb4b339f740d13a1fc02a96c7b70628d60c46ff1d880a8fc68dd6da74374e5aa498c47e018f943a859f46b033c48da5c799e160e8e368066a899d8453310cd975813ea62178965a848949b717991f36d1613a00fe847ff98c582fc23a74e02a5e66036d6c9607281261e62fa239fa3024fbe5b8737625e16f1c0d52ac3f6781ca1444de09c84ca8c080b0fc977345fd18fe67520157ec0f6e6e8ae8620ba56f6f07e377f62e3021b9f92c69fdd96d99c866a09125418192239f97e99ae0e2491179e23a2c634b13c2fc69506d077c3d9ba1378a8a28b928f652c171fcdae3da02f8fef37002f4d89b64ac0e22ae915a13f8474be3e78c928d1bb0302e0169d01867a016e710b4eb198b04ce61e7c4cd3daf326355140e3c8f607760fe855c244d11e23251bb2042f9e8051150e59a59ca7440855d76c19311925f710fc56605a8c17ae873abdd552fd05d31eb003bedee6e64e4fda9f85e6278d805cd1c6cd1c9f143d250cd638d0cdc0b68319d76426cbbbb1bfdc0d06b2a754f369c42f379073c67b6c787a4209d88b81fc860daa5765810e94597f4609f4b80de1bc57eb3f6cc9f249e01fe00f362dd81164b6edba3fff00d974a832370bd4544e82f0884c8d721e1531232972945e5e26b92d0945c5319a26395f81ab9ab8206f119f43fe5b393104d78a6a6a1e3dc712801e33b81071e41d1ba169e031d984fccff4e326cd92254db22ad3dd36a6ffea260d34a6d4cc83e487904e24ee6310f3cb017e38c76ed03a07f5655f851610a2fe69801421ac4d27853644e15993006f106bdc26c50acc11f045fd585600ddef086b9bb438218a721010cddd2a491c909818351ee7ab8378acaecd1093e06a8152fa5879f82ce890a8a3e0a89209e4c3ca34795e4aa0b5163291fa46dca3f0c1a26b37ca37459b8c85debb270b059ec83230dbc5c61fd1293a7fde18bb97936f136d940ef1b83abcdbc87468178b54c1e1c8c9ba301e11ed23b198133b55c321229bab9c1578ef0c106fe1a9e1c83636ca6102e19d5b64f0c7ff0ef0f0076c5e75c2a75a576d01284b049f42acd8c6b57f2dc800e3e8d54ead045e0936126ef4f257c536f106f02629ff2d0631fd021ad75dfc3532e3a5cc4526978cc2573cdf4fd4e4cd2f094eaf9ed6d57f7b968903c62410a2b081cddb9a5f0b9a63acee7a011e8ba6f9e75e25ccf19b8e47178191a07f79dfd5177bafbf7a5803b238ca0ceed8fb5fa726968b5f579f2abbbb75a1fa0159b98aa050693a9ed1888908d9b1becf7944917388ace58410a3edb6c866e65c8b9d7c8e4cd609f40e34784b9ed4925d6b1b7c0249625bfaa52136590aaa2a21496053f15689249766db43ea6b6dab09a286a967d9bac2abe422a99dbe45a69c98d08341355a7c999e6a7b2ed113e9c771b4498da4e639819944278007d2f19d82b2549925c46a2e04e8ecd1286d78ad3a81da9f5f1b5493547442cecc0fb1bd3f21e10ce34fa5a78a7ce6e00a19cff4b42c95f873cbca23e6fe39ede64491c5d47f159175d5e4b29d6244b330e1f932d66be987445c87f8536d46fca7fdc071166a6f76fb8cf14587eea5fd3857a130713266f6f6bfa9b6b8030197e8bb4f475b8d0a6af090f2932dfe1c723ef5c045dd4fd41b80f475c1f3bbf1fda9aae9e10695d5fc49e8379105fd0aefcdd5b8803df4e4decb70e7ddbdbd316351542bc6be93f26dbe59c90b8c66038774ad3b4477d16f34ed69d44eca9610e6bde4801b3d4e95a8adcfe3e6037deee00679b1c2e77be0ccf7c247ec235c30e2efa912a88e78dac3e081735bafa487743f13388fbde863e78693f33d545c7d6ae9e55fa7a239eee94c4a13b67ee25eb92ee9359282423e0b3075ce18288fa08d363814018d47dcc50a9bba73c496699d6a17ed762c5b95dcefd89ebf97a26ce0ca8cce20e526af3aeee133c690b31e09159026f08dc6a3199b9dd9c91680e90684bb22f923c0085dcb420898b3039c23dd27de0e5bbdcef7268b375b9eae25b27ac1e0d674c0e1af513f9fc73d2d70ae2ae3dc93dd66005bbb543d4c7f0270390a33982ac96e1db2c634d61f81d929dc554252e601592948657ee2d4b1942e7fdd293d90a78211f896f1f4d679892fc255dd1dfd8fcf5e924252d7a693612af1c84b3cfca50d11707d7284c372b24381b45b2665e2687a723230304fe2329534fca742e501cfc48de69eef37f983599350dc902dcb960087f9e4644a3a9ba541d04383a7d77ef0470a338497756e20bb80ca98e25f577776e6f3ffb1789f58e9366e40caed623108c1d321709ad7ef9420b4dfd2f306b338990630206b2e2dedee2d5464bdb93d0445b17785964b2cd8f4dcb5ec6f35df4907414b1ee4f4808e0ef9f92a9fb92c801807c108602a20ef6f67bf26c9fc4a01ba73c6c5587bd698efb81e742766518d3d1c9391e78582bd7d81976a49b31702fa97951c52eee3e182c234a7d6fd75bb3e33683b45fc8531bbbe24e3eeb39f674bac2e01f53af772d35fccdeee35b4fc892cd804f391cba6bec63bcd0d44d7ba0f0676defbf87c76d9d4ebb2120f73adb1c70a1e74c22eaea29ed0a6870c0d7dd0e50ddedd8d047a3bbde3556e3de808eb565d43f450b948c36c479805016835b570491cff071f5e9f0efc65e613a74677bbbf7aaf4bb08b71f1de766966cc0ebebac90df0b167b2b2151de11600d79d708e05f1a4773777b8d0d01f504da12cc07e363ae92e7cb765d3cd8ca7d5560fe58b92f3dec93a8e76157a2fec0f300d9b5b2c056e16047a5fcc047f3da451080feedcab1820ccea508ef253aec23bed5683197e68f4aaa0867bf73d9008f131f258d57a1564de1a4e429743668a2a9591568274b4befcffa768fab04ffce117a954b7b04ead557fe88d73ba9da276cafbef320d1fbbf465486a4808ed636227f84670fb83893ffb40b34a3f2be73bc65767fa9e673180c9fd9dddb439f85333db7eb5c1ff7404653d45725f21ba1b99b2b8b754e65146258a007c6af05b2e0c8e634e8cd0ddc1d5ef080811a80c092ed0ebedd0d825da506b7b7bbe9995108f7a692b3d0f31736fec597cc0c18f979f8731885c8b1f948465104cc2908cb1ffd4e7875b9af6fbfff2827304a12901d5dca8e39e3ed435305a3dfe9e7f4f04a720940322f29a3510bc73b8e3fb71d1a2e9f132ee8afa489091512a585755576478022847fb1546c98d57219864c8feab2711e47781a9f8cc83742c641eb49b15e232b187ac6f53c9e0cc13f1db9d40fe6a30c829164308f8aa93a143f9893bfe4cc36580f8825e8bb30cc4cc8c5c8136e8c91467238bdeeba151e3f2849b8527113410ee3252747ef61e00646b0a5868eda4fda2e3f106896fc99be16f2d2ea44dc1e017e502a41f6ca24076c2ba34b064499532b9827b7d971541ea05c3f007681a1bfddb54c8c6ec713e35f1c653e98b5575f8092cdf0c8b273a523740906f9a938c54027613e6ac208faf35b0400c64ca4a9b344492405381b81a9cb4016401a72126aacbda449ee020e8161b55c407f9fcf99eff3e40c7ca2baf74606e59c3ac9b9337328af8534326b9212223dd296e39fb7b9c05b985d4969c8c3a9c8d01f179b1e82356bd848796ae48d5cd3cc0b49316943223d96db8a427a0c3845004ffa660066cb2f0936596f47360c674d9397cf5a7eee11de33f3366c83f3e4b81542eebd073ef3a99c01040b4cf396e807722554fac4e2901cb12ef0a0d9dc7202da5df329770d9f56d8907c1e7854cdbf2e2675f3bd269b399f168cc235d09ee07f68872b2590cc252e5fa3c9b8b90916f6a4456ee1b04446ba83151e6656debe63cbc51068e4804e08262105dfd456d1782f47697f835123310db6e803d7a43a4df8a50e7236aa6d36a51e6bc0d33c743c4e7d91c882e3cf1abd47fb30a9bbd5e241da36e815568b65cc5f560e94cdc5f5fee019020becf4fa03786d46d44a1d254e645e7660feb247a7bdfa446fbfa1d3aa0f53c3ade68bee4d850c922a2bf87390142a434e7b6de669c9520abe90eea532fe9db97bf30548976334f717585e26ed68189af076f869728e03b3ea0d4f3d2ef5a2be32b2e7d309b8f739c160700b2670e8d84ad13118196c557b9787119e6c4e1244350ae72823b7a769e702e71b44936a3715711a148aa2192a98bd7c202cb1c41520042c89ebb1b2dafb98e3ae4e83bf8383700f2ca301af31739d464c2d3cb144cc4d5ea2064349d00b6345698fa0b4232be14d39f2e605848649b413fcfbef4d130cd131620110e279f4d0ce1c5a50a35e88319d4d65070786e9c724a940312089d80bfbd82cff99ee86e41c29a04c1945549df8133a15a63c1f28930d6e760b7b9bc3d6758b3aa6cd228f4cbc71470240f0f3d31c6c90ad6c05be021ea2c7465be492b108f10e38a0600a319a2a8e8658e61c3e10075e03562a61af70eba6166215bc5a66d0c8ef30e3d825b25a9e473c522b0c7c139f8697f7068921e81b2331ddc0184e02a853a03cc194296ce00b7169a56f484e341e9c8e7dcf10937cf9dc1499a42e32212ed9c094b8b8fe63e7594c09b815f0ccb2954dddab2debd7a91abf4d987929e1b8162a5442f3f695b0babeeda91e29eee134ca11dd86e5ea31f20189b939cdb83ff85604e9be9a442362574dfab09702a4762f69b3a28beac5308a6ae8dcd6fb089506c38cf39028fb542fb87eacec9ca1ef55ad3b71ff44a576b50c83ad83f4e70a94f516404aee1a52417889a948afc95ce0aab875bf90fcf9a0779d830cd6732def3c17af8d8ac6d5350a914f04e2a241cc063cdab555543330310aca5105e51e31695c0d1a6b81e1984b4c6c0dfcb5b0456a59faf2bdce60315182876326e24393616b9cbdc20c5af2663db490b8b8e234ae6f5b685c3f6bc84237b352afd42d92620577b021d3d7abde4a96e02e1cd0a3572ca93455e6ec82a6fe343b85bc7ed2ef1cc65b92f6eb8546969c345b7600643c0f95d0a6579198405c759d573dc218b007a0cd9e1e9abad4e53867fe74d08190497dd8fa3758cba53841c0ad1016f72e06069e47dcb5bbfad874d98a5c470ab5944b4d4bd2740787d8eac905872b86843debe5d5e3c5d5a2c4a635a2ae71ee2f84c4334a9d216471b1a7e979d3a24f53bb3ea1680ed0107f5642d186a72da1a819dbba06c621b0cdebe46eae88d1656a72e2a1ed2fbb0e49365955546c8d19d29a272d216c87bb70660f9715e2d538e4ef63dc1105020acd238a8e70b83f18fdcf2fd4f9c781f3dfdbceff77fe3efcf56667ebd5cbdb4f47adfe85c1b35fb0699a3607090d5395c55b0dcff280f31c0b2501756cb60d34e5d4266b4956bb6931243f26f115de5730191862d942afd6cf343b3a5be39ad5c0b6b18d25af516c267c9145c6c9e23ddbea5e072e86776dfcdf0452df20ef2e3025ccb52a4859546cab61152779e3d5cb3cb4339ea90f2ed8667374b7958676269a431ec07f1e60bb31dcdc32e11dd97036cd533cf02095f9a6c2c6df374b6384fe6209556a1eaebdd9bcfd603d2d8765c196e939fbbc5bd35582a0f4d54151cbe18d55149ce9a0ace2fe393ace955caac66cbb3b2ab2acac4eaecf1e553b5902b7e927fb34d750788de1525929a5591e5354c46c458e81cd86e4270e7a0998de95cc04627c4ab8ceb31d0c0dc290a0b0680ef42d243836feb99926d962dca94a552a39f8f1896956b987ec217be787df4c3f984534b7876bd3a5530f15f8b326f61112abbf2eea2f757d82ad3bf931affabb318d18f40b674dd35631344f7b86b567e5ea17b598b620fcb6dac7524bb0443534ebbeee84843d268fd9dd48422c8bbbd4c9548a00591d0fb09300ab7f8bb0901e06158f754eab0df204eb7522550a8f7866b208e625c953248e403d4fb10493273fc9a5021af542806d25431e75a23189948c4f265cdb794f72f904cb1b9afc2eda73f4eb92094ebe8314926f0e2ecc278bac266b48332d816f95e96b5da852035bd5c314f53059ccb6bc6175c8d2e4158f3e759c7b2ac3742f7ca220e6472933039a9dabf95991eab1a3e633470fc31fe7062e5b8b184143c135a54fac6017ac0666ec5798fce69bff4754bbe2b85b02652bd9bd6b76f4d4c4df085fdee2e329794cb87938b5b8171233fe4184cba91632f361144a864a67376c1947ab1b8005d0d3f43000b0c930f3f9b37c63d73d79e5e63059178dfbb8eff6c5ef198bda1cf8628b955df8fce5c118ff4f2778a9522abaf0850eec869dc2f51267ddc657cb39d27692b985010ff7073b8f975528d2b5c9732f3eaf2c67dbb33de02900e7e58c091c8b4bba5b68c1ec77f3d60b998b002c75a16b1c52053303310fa0938718e1de6fa05f871a26b61be09f456ca133abe25413dc6b06de58c852e8efe8f4dfc3124ba209fa6c0e6a58eccfad52f3923f23a51c22ee2834d11a3aa5bc100a7163ef66ccf8b813733c384cf25418fd2d8cee7471831ef8b4f84db62b66a6d75035a0da9d43ac0881a1bfc8dec68c579ae96adf18fd088b4ac96769ca19cf02c3fcb1a8b4eaa2d2da8b48bdbf14f4111691d2afe5b4ac20255f5e534f6e05a9e600955672f26f00ddf35a4d5746e3e1fdde46df048fc1b0d0ec54c04dbbe414827b010312fb80746dbc303d5b5f05673def6e952ca20ea2b766038f1a16e079b490f147fae19c85def7930844e86dac67020d079e56042a045c938deff9e1486df62341b1b7d5bcb302194a203d1a21ce187eb2c16c9b074d7f6ebe8e83b9cbf40ed9e84b846a4f7726440da4472446726ca0448fe4de9d4852eb6f0daad4617b34c29c52093e0bf3cfc011664a038302b712901b881243e373a54ffa11a6d6df9dc95287ec317588ade4694516296262797bd32a9355d548a1c375144911ae279d45ad9e30336b30c7e9e6b56c9da4606db0c54118be0e8db73a58928b299a98ca5bf7955e7928d64ae13dc58d7f55aa10bcdb238f50f4e99f2d214689aea7f683ed7764bd32dcff4a9c977c586219ebd9262bf35eedb527c47c0f454d8b2a79771a9e3610126faf46c3e21b0f4abe96e4c52379e689e73d18fff5ddc91dbdf1b48b157d711870988dfe686aee9dc2600d913d88f51cf794d8437ab8aa24fbe16bbab803b276e84774a094ba16d26bc4367dd8d7774aba5a86759435aa619e83f274354ad3f6ee6f2f2e4ecfcde22360d1a45514bbf8e1bc43a124538f0dff0dd4f0b9f99ce8a114d78ac9069299e7c9e39e9ab8f4ca3d93b07e7f2e474db75795c6fa9ee0d313f23dcb8cfcc61e2d086caf22057a74b5ed7ce5ecbc7468c49d4bb650a3172fbe1c00a7d219c333f94b7dfe7ea789f19861aa9b4f4f005e5c29193883968386a6e7348b9a61b3c2b75d4bd961a6ed981b16824dd05c2c64d2d4736aaa04f2c0f3f8502272108a70118858113373664dc09cc56fd230672b7a2d671fcd677972c75756fa6efbbfc95ac2aae977cba1d270684b0a3e961f3bf94ea8cf003cf37f56c87bb584fc81ef8b6bd22a99ffb15ea2bef6d56e16ba7211e18e85b84860aeec26358f727f614eb416570825752fcd593d608a08ba42e9525be65da2f83f9203ab348ab24560e8629a6d3d95389c293a0e8a163bb61baa3cac6292ed918ba4080c5ce61cacd96a93cc189d515ef90a78699f47f6cbb9a27ecc9c58fa79bd191cb66ccdecba359dcd249b99bdae78dc13d7b3dc64fb5f3c0149f617845e01314c684735b9b9816e2b35b056b43f45c393acec5aea9c4a76c5d975f913e38507641f8688714f6f725de49106498b6469cd3c1f202f0666ef1fe39cfc4e7e53b67ab97d08284af608bab358f73ec19ac29d48bf3bbb1fbdf973e1ab4377559b797dfc6cddd2c5daf73d61eca537df887b539af62bff7673e2926247d86859b9195b62a6525a94148bd0246567f0f38ec27ede1174060bb2b262ad258d9312c6d502c7b936b65f8748b7264e7123430a30f274c8e12e0589c09b07a6e6d1c6b4b85bb15010d2f0b3831aa0c754dddc608f277894e317fa2bd6c2297cb1281bcb3e2b579234c563d3323c5373441d5f4f7f63d94d0acad5dcaebf99d2282b5e49ea6027c23c1d9e83b235250e4defe6aaf4059db460a697f34c5ad7b250acb2564ce76022e2aa91cdf985e2d332bb1459a1cc3a09214c8f2933cc774a58a615834c792053ee47690714bd70769e7f358c705b81d20bec05ac09e60d7c87fa7c16ee1267e75504fee735f7f47c7ff0eae580cc1992ccfc1e8df3625a7b13f0c1336557f84043aae2e63b296c99b35e329547225ad8d9f8dc859f5f93e7db3b2fc977f4524cc8a190b3ec4ccf54a0fdc645a1234c4a70906021d56e6627dab6f6777d692c2e79ca585eed804a60d843ce26265dc46bcf434f826d388ec3390d1a1b483d8f2539f880c70dcf5eff44cedd7900a46c6c1b7b9283377218eb4bb01d2efc6e6a76c84272cebdb9681cf010c8e961ca67ce7d1e553ac84bb7d515ddcab4f90e844be1a9213c338527e2ebc07c077a861c73163453cfc21831240a96fc968df89e2d401acf63dfe757b47194bf31a6390042431ab2b027c6c59f2dfc98171ce3a1ebc7665b7289fb9498ea6b539b4612e33a9acd825802474c0bdc98439054ec2bc5ff33e183c11b027f8fac97f457811b26669206010ef2033c8dd12462ccbf459a84e43949dec3b41f48c2b054aeaf3a267a6813ae27b17bc9b419f7924a70fb42a146a0613e800aa9dc5836f2310d39f036002022f030598fc1f1f0d17026c4cc67a62661345221f8b10b67268004d9eff651770cbee7b6e12a68170a215ab28f4c42c0a510670fc6f9ef912fe3f6e15f00a911787212ba2b8df95bfc5b3cc204878f3b4006e3f275fb802fc9114c46885a99fca0bd95c60437dcd312d16557ccf72640e0ca9d25b3bb05722741fc3c2a63722139fe0ae92ac35f71f0a2c3d17b8acb75858b964157e563940db091bfa9447e0eecf577e7ed486d3b86a2760ab7bae710f1617a020e37b8513432580dc687e9f5122eb5035d406c051ab23a52aa9872bf002f940b9e9ab6063ac10d77d90e7fb3fbf0ccd3714b4327d35c7778c5417793f518ecb7f731930be7f9707bf8a2bb7546b6d16f6a94d3b0f33d5b620d2554752012459506e0d09bd2e1e06fe800e8fabf000000ffff010000ffffcf4a72f7c49d0000")
+	bs, _ = hex.DecodeString("1f8b080000096e8800ffec7d697bdc36d2e0f7fc0ab82787342b764b8ee3995524edea7026ca61eb91e4c966f3e49d074da29b8848820640c93d8ae6b7bf5500efa3c9564bb6e69d7cb0d524ae42a16e00c5bd67276f8e2f7f3e7b457c1d06079fec3d739c4f2613722ce285e4735f938de34df27c7be705f98e5e89293912724e68e4418d484b3e4db4908a6c28c688f619397ef3faf2fcf4e8ede59bf30b32e301db1c63778741404c778a48a698bc66de98bc558c881934e38a289148971157788cc0e35c5c3319318f4c173018f9f1f4d2517a1130ec2be02e8b140e473571a174cac84c2400128f0c0c3f9c1ebf7a7df1ca0c3ffec4716056383912d068be3f62d188447387c6f1fe482d2217868fe6e6958b331241c0e4fee8222b39d632181137a04aed8fb05220e8d508bb64d43bf88490bd90694a5c9f4ac5f4fe28d133e7afa3a2c0d73a76d8bb845fef8ffe9ff3f6d03916614c359f060cba85115904ad4e5fed336fce4aed221ab2fdd1356737b190ba54f5867bdadff7d835a0c1310f5b3071ae390d1ce5d280edef8cb71b1d794cb992c79a8ba8d457a31a4db42f64a346c0a32b58b8003006c5da4d34e12ef6e44b36db1fcde8353e8e6340e4c127d840731db0831c89e477727b8bebfc1ad6f7358cb4b17977b737b1b5f2016c675321b4d292c61357a949fe340e79348637a3140ea406e533a62d84e699e8450c93d0ecbdc6c6a68490a9f016e4d6fc2424a69e07003953a1b50877c95fb6e3f75fa7653398b433a3210f16bb64f42d0bae99e62e25af59c2465b247fb1450e25607b8b281a2907a899cf6c17779f983f49f0bffcaff211432ae73c72b48877c9cef82b1656ea8e115827149150310506b86d83e5471605628bfc2822eac25fe03c258020b7c8e818d886330920de00847937b52128101b52b7877ce31d6843ba5a1e20e9344b115fdda5335890eed2bc676f69cfada579cf5e8e85a9901e93167791886af30ac45cd4d0bc4bb6bfaeae74e98de9c6f9aa58f058288e1cb18b34053c795d1f802bed44c299262014743e94796d08ce4182b3a0d51ac2c482248cf2361e577140612d7904b4ce9c6920dcab0c0e206dcbc9408f197de48463c426904e5130a5eed55ca2c4c3518404f0e7d38de75fbedc22cf5f6ce37f3b9b5f573128a9c713b54bbe2c4d3ec3cf4efc9ebc28de67887c0eaf9f67afefeaf302328bc61e05c151a3f380cd00daed82d02bd3dbd92e5e1bcaa7019f23fe71925ff7e32a437026889bf8c5b520cf7888529346ba85134047e4cd6e7cae996378069bde80a0a948831b66b1ff627bbbb527af2158ecfc9f8358e983c21bab90068153c162274069e3ff1b328f53b211d2f7294efff2f22ff1fbcdbc8394af40cbc6202680a40fec9b32f7e5950999fc19681f74ad2694e4b2968026d328b6d9783edecdeb923f035224489929285612fb8069054c456012e286e0524d25a3570af57020a0b964b114d02600129c28d090a0d06fb8f6cb3d5a7a5263f2e749feba86040968ca56e52e27c7bd896141d0c413ab8a3fd93333c4228f5fd715faab6bd06746991fec4da0dcea29b076c8a58881a524414301df45f43ad7f7f41a4bec1f1443d94f8fcd6812805a86ee99a9c7e7d42857ab730c046927080505e4c8b40cb515704f750c672ac1a802d87838cf4a50be8d88922eaa3b079f9c9de77f355a96582b60f4e573d0c18646edefc901c995ee9e21afac339f7b20689df7a015abe35b05946806a3ff0e4885a283566d6dba3b486b64334982d23c32ec947e1ac6ce276e343dae0c07459fc473104bec349a8971c46e4af83115c1b2d4224a55ba7dc8edb0a98eb201f027fc2b56c45a11d6a00353f12a1f6863b33a401909f36011fb68c390fc97e3faec5ac2df241e65b3fe9c852a17104527c033910205c28a5fce350d12f89f490554b13fbabd2d4f176b287d77373a786bdf021192dbcfd2da9fdd55916c069a5814943039097815afe95c3c29624fdc44d5d9d214317f1ad5eb015dcfe7688da2204a1fcabdd4e678f0cae3da02f8eef3680af8d89be6a40e2cae115b53f8472be31784928f1bb228a90069a67190835a5e4390aee72c16b886bd0be77b5e6dc5ea5338f43c82dd81fa177291564588ab48ed8308f963104480951b6631d3031576d9074f8e487ecd3d649b15a006eda12fac7457834077c5bc07ecacbbfba1910fc7e23b89ee611f343ee8a2d393c7c4a1f2138d043c0868319bf5426cbbbb1ffe40d16b2af540329c4175bf079e73dbe36362904e45320c6450ed523b2c8cf5a28f7bb0cf2540ef4d92a05d7a1625a965803f40bd5873a04393dbfa683f7cc3a5d26008dc6c1111050b022ef24d44f88c44cc654a51b9f89aa438253754466858a5b64661aaa0427c06fdcff8fc3442159e8b69e8b8301c2ac0044ee8814550d6aea572c0030b88f9df4987ad6a847a5dc4b5676aedf95f96745aa58e71d947198d80dfc93ce68105f6e5418ebbee01d03eab0bfcb8b484973e468010078934d614f1a92253c6c0dfa0d7180d4a34d88360abbae0ac410b6f5c983b244c701952c0d02c4d2b9998101818d5aec77b93b84a1ebde0a3835ab35206d829689ca8b06ca39018fcc9d432faa09c5c37211a241500b7cdf8fb51cb62565f541e4b0f85695d650e364f0230a481966ba45f21f2ac3f6c58a867e36f930db4bed1b9da2c7a68658897cbf8c141bf391e11ee21bed3113853cb3923e5a2db5b6c728c051bf86b7c7a0286b15942786454db3ed1fdc1bf3f00d8359b7329d755ea414d60c236d6ab5533a65dc572033c043456994117834d8691bc3f55e69b5983f81226f6298f3cf61e0dd246f7032ce5b2c1452c96c6275c32d72cdfefc4040dcfa8f6efeefaba2f5883141e0b625881e3e8fa16c3179aeaa4588356a09bb679de8973e33330c993e82a3206ee5bfba369740fef4b0175c6e8415dd81f6bf5e5d2c84aeb8bf4577f6f8d3e402ab61155070c2652db3310211bb7b7d8ef19932e50149db312177cb6d90eddca9073af95c8dbc13e85ca1f10e6ae929aaf635f814aac727e5da4a6c2201345652eac327ec6d024e7ecc66843546dbd623d50d4cefb3658556e426a91dbf45969c90d0bb4235567c199f652d95584857ebf4284a5ed5586b94229b907d0f79281bd4a90248d65a402eef4c46c61789d739a744f6afdf9daa09a236216f5ccfb1b53f301269c4bf4b5e69d19bb21b872c12f29267f1df3e89a06bc8b7a06a32535741dc5e77d787925a558132ded73f89864310fc4b4cf43fe1bd4a1415bfce321903037bd7fc303a640f3d3e0862ed4eb249c327977d790df5c0384e9f05ba4a3afa385367d4d794491f88e3e1e7a7d11f661f707e13e1e7203ecfc61706bba7a42a8750391780ec6410241fbe2776fc00f7c3333bedf3af8edae4f3bc45404feaec5ff01d9aec684c40d3ac385519a853d9aab5874b2ee22624f2d6bd8b0464a33cb8caea593dbdf87d91d6cf780b34d8e961b5f86663e123de19e610f15fd4815f8f386571f858a5a4d7dc4bbc1f839f87d6fa200acb49f99eac3636757cf6a7dbd164f774992c8f5997bc5fab8fb741e09c908d8ec2157b821a23ec2f258201006f5102b54e9ee292f92d9a67568d0b7597161b7737fe2da5f4fc5990195d9dc414c6dded77c82922e17038acc16788be3d6f0c9ccebf68844bb83443b827db1e42108e4b60d49dc8429263c20dc0756becb833e8336df97ab6fbef5c2ead168cee4a8553e91cf3f2743b5209eda93dc632d5ab05f3ac443147f3a0039f61164b56cbeed3cd6e686df23d8590e55e2065629486968e5c1a29411743e2c3c99ef8097e291d8fa7836c790e42fd98efec6e6af4f272869a7974523f1c9413887ec0c956d71308da2ecb0423a672348d68ccb14f0f4446400c17f04659a4199de0d8ac31fc95bcd03fe4fb327b3a622598039178ee1cfd3f068345557aa0701c7676f1f1c016e9ca4e1ce9a7f018f11d589a4c1eecedddd67ff26bede495a8d9cc3d37a0882b123e622a2d52f5f68a169f005466da631524cc88057dcbb3b7cdae8a87b1a196feb121fcb44b6f9b171394879be8d1f138f22d1c311090efcc36332335f523e00900fa34880d7c1de7c4f9eed930464e38c479de27030cef13cb02f645f84311b9d5ce08587b5628dbd6e47761803cf929a862a71f1f4c16819529a67bbde9813b739a4c35c9ec6d83573f2d9c0b167b31506ff9872bd6fabe1eff61cdf7a4c961e067ccaeed07d7d1f63856666da23b93f6b5bff032c6e6b74da030185d5d965800bed338953574fe954408b01beee7180fa69c7963e5acdf5beb15acf06f4ec2da3fc296ba074b431ae03b8b2e8dcba228c0386c5f5d2f13f8cbec270e8cef6f6e05de9b7311e3f3a29d42cd980e6ebec903fc82cf6569a44f5448055e47d23807d690ccddded350e043403684b663e3a38e12a2d5f76eae2d176eeeb0cf3c7ce7da57048a09e477d81fa43cf83c9ae1505b602073baac4073e9ad52ec210e46f5f8c1578d097227a10ef7008fbd6bdc5829b3f2aaa625cfdde6d03bc4e7c9c565e055b0d8193a1a7d4d9a80da76657a01b2d1dbd3f1bda3dee12fc277be8752a1de0a8d79bfce1aff7627588db5e6ff328defbbf875786a8808ed656227fb8678fb83953fcb41b3493eab9737c654e7fa9f67b180ccbece9ed71c0a2b9f6ed3ed7c7bd90d1e6f5d591fc5a68ee16c2629d5b19251f16f081fe6b092d38b2b90d7a7b0b6fc7973c642006c0b164bba36f77c37057a9d1dddd6e766714dcbd99e42cf28285f57fb1915901c33f8f7f0fa3e439b65fc928b380b90561e963d80daf3ef3f5cdf71fe506468503f2ab4bf935677c7d64b2600cbbfd9c5d5e491f0148e6a569341aee78cff5e7ae4bc3d57bc225f9955631ae422ab430afcaee04a608ee5f22151be7b95cc611d393266f5c2431dec62713f28d9049d879536cd0c80a869e73ed27d331d8a7937cecd22fc9602d15534d487e30b77fc9b9adb01e204b50e0c230732117134fb8097a1be905f5a6f9562a7e74b470a59236a41c254b6e903ed0e02d4461d30e1d77dfba5d7e39d06cff337d23e495958f7854026ca28c9bec930914d85a46ae8c8832375830666e23e5284840d0be871986661dec096662e43cde1effe238b7c7aceefa02046e3e8f3c5257b94e97cea0b821a718c8278c4d4d1941db7e8b00c018953439972889a500c32334391ac80250434e238d79983429ccc13110ae960be8ef739f05014fefc3a7627c6f62a65c6027bd83662ee875a046e655324464d7db8af917752ef115465a321cf26826f2e91f94ab1e81666b39547966f88edcd0dc22c966d23589ec8a6ee714b22bc1d904f0d66f0e60be1593ce26efedd8bae4ac6df18a552bee40423bb36ee32e384f4f3a21e4de3ba0b380ca3940b0c0906f057fc05b426525760ee975eb120d9a832ea720e9359f71d7d0698d0cc9e7a14795ff7539c05b9c3bd92ce8b4a4206e00f704ff439d5c4b87641e712b1bd5c7ed6db8b0b72e0a6d87e932b2d3ac50986b7cdbc6a68e2150c901b9104e230a76aacda8f14e4eb2fe469356649ad9a23ddce0ea2cf89719cbf9a8b6da8c7aac659ea6d0f1380d44ca0b4e306fb5246d619a83abc39ab475d042ac27cef05fd42e97f9e2667ff40c8105727af51e2c38c36a958e5283b24841e0bf18d0e9a03ed1f26fe9b46ecf34e6d6b04bf766428669c615fc394a939621a5bd32ebb4645b051b64e7aa8cad67dede7e01dce518c9fd05a69ac93a1a47c6d51d7f9adee9c0087b4ba9c7a55e347749f6023a0553bf40180c6ec1040a3db05c74024a066b35daf228c65bce69b0a881e162ca48ed5908ba44f966a269e69b1a3b8d4a09d20c16ccb93e609644e26e100296faf89865ed5dc2f184a799bf8383700f34a301af358a9d794f1d34b184cd4d8ca2014385d14b63c5598f20b463cbe16df1f2f6cd849645b40bfcfbef6d0b0c9e32ce0220c4bbe9915d39d4a046bc10a33adb52108e0cd11f90341bc588a46c2f6cb1d90a34dd8dc905624099948a283af127742a4caa3e10261bdc9c1cf636c79d7b18cd99b6b33c12f1c63d11008ed04f3ee8209be50a6c05bc508f95b6c8156331ce3be430059394d1647434c83277f20139d00c48a9327b85c738b510abccab63050dff8e738a5dc2abd575c4ebb5c2c0370d6874f560901884be361cd30f8ca124803a03ca134c99240781105796fbc6e454e325ea24f00c32c957cf4dc249ea2211e2f60d2c898b7b41769dc58c8059016596ac6c185f6d59bb4e35e86dca4ca394e23ab05073d3bb77c59af276a078a4789ed30847341b968bc7388049f8e666e3fee85b1166676c5289885db5c9c3410290da73a5ed822e6e26c6288ba10b9bfb23521a1433ae432aec33b9e00689b26b86b6573d07c5c32395da9d3374b80eb39f2b60d65b002ab96b50056e268625bd3675813be4d6fc42f41783de770d72582fb4bcf75abc32221a77da28783e31b08b06361bf178d76654cdc1442fa8982a08f79849636ad0440b74c75c627c6ca0af854d58cbb2c60fba82e5a0095e94998af76d8aad75f54a2b68d19bf7d081e2f2eed341f30843eb5e5a4b44ba9d9406857111152b98832d51bf41b957f26077e9b21ebd6669d6a92a659724f5a7f98de4f503801730de9210e0a069e4814a737c0740c6bb51296e06258c09c575dfddd563f4010700da6ee9a1aacb4c8e0b16cc463d1332a10f9b0b07f3ba941708a815dce2c189c1c0f248fa4e5a9f982e3b27d7134eadc455b3f434fdce21d67a72cee18a2ee1c0dc794d7f71352fb16dbfa86f9c877321f1be52af0b59def8692b6fdb006aab37c4152d001ae3cf9a2bda52dae18a9ab1ad69600c025bbd89eef6ec187daaa6401eeafeaae9904695554dc4368821cb7fd2e1c2f6980be7f6a259c95f4d22fe2ec1d351c0a0503da6680847fba3c97ffd429d7f1e3aff7fdbf9dfce3fc6bfdeee6cbd7c71f7e9a4d3be30f31ce66c9aaaed4e42cb52e5fe564b59e1705e60d224c08e8db681a49cd9602dc9f3382dc6e4c7d4bfc2f70a16035d2c9bf4d5da99e67467a75fb31ad8d6b7b1e83582cdb82fb24c38b9bf676b3de8c065f7ae8bfedb401aeae4dd07a694b8560529f78a6d66acf2226fbc7c51b876c6320dc004db6cf7eeb632d7ce78734803f8cf83d96e8c37b78c7b47369c4d538a971fa432df57d8f8c766658c28582cc14ac3c2b52fdb8f22ac27e53045d8323967cbfb255dcd09ca9a8eca520e5fac22e04c075511f7afc94921e4323166ebdd5390e529760a79f641a5934570977cb2a58584c2677497aa42298bf2980423e65872026436263f71904b40f4ae64c611e333c27511ed60a810c604994573c06f29c0b1f1afcd2cc896e0a955aa32cec10f51ccf22c3e640fc9bbb80867fac128a2793d5e1b2fbd72a8449f0db68f1159c365d170ae1be26cddcb8e7939dc8c699dc13077d654ed6443533ad0ad3daf66c268f8b425e6b7993f966a8225a2a15df6f50724ec95798ceec6127c593cb14e66528448ea78999d8498095c44a5f0308878cc795aaf5004586f52ae5278dd33e745502f699c2235049a718a253379f28b5c49a6d14c0ad8953ee4832e340691d2f1c9946bbbee692c9f60aa4313df457d8e765dbac0e9379122f2cde1a5f97c9195642d61a625f0adb27c9d1b556a64337c98041f268ad91537ac0f5959bcf235a89e3b5055981e844e14f8fcc8656640738ab5b83752bf82d47effe871e8e3c2c065f3122368c8b8260d8a65ec92d6c088fd0a8bdffef27f8868571c4f4b206fa52779cd899e06fb1be62b6a7c3c218f01370f9716cf4562c43f8c713bd542663e9242c958e9fc854de968650390005a9a1e3a003618663e85561cf07a20abdc5c2cebc3f110f3dd36fc9eb1b8cb802fd758d9842f1a8f0ef0ff6c81970aa5b2095feac01ed8293d2f31d6ad7fb59c226d27b95918f2687fb4f3e1a20a65bcb659eee5f2da76b6bde7039602505e419840b1b8a5bb851acc7e436f3d97b90cc05213ba4121753073100b073a2d440ff7611dfd26d4b0b0fd00ff2c120b9dd915a79ae05933b0c62296417f4fa3ff01b658524930e47050cb667fa195dab7fc19a9c410f144a1f1d6d028e52557881b7d3767c6c69d9aabc2511aa742ef6f6164a78b07f4c0a6c5efb35d33b3bc06ab21d5ae0fbe223886c1226f8d11af2cd2d57d48fa036c2aa59fa8a9463c4b04f3c7a6d2aa9b4a6b6f220dfe6ad047d844cabe9cd3b183947e854d3db91da4860154d9c929be07f4c07b357d118dc7b77b5b6d13bc12c3227352010fed923370ee050c486c01e93b78617ab6b60aae7ad1dd2a51441dc66fcc011e352ec1f3c15cc61fe9fb0b1679df4f6360a137899e0b541c787311b010724d36bee74713b5390c05e5de56b3ce4a68a880f4c11071cef0f30de6d83c48fa0bf3a51c8c5d666fc8c65024d47bba37221a200d46067e0bfa113094de25a820297d772f3c35fa5b03554dd83e18e99c5109860c0bcec13a664a03d50209136026701d2363886525c310d3e8efde686942f621058b4df569f91831621c7cfbd24a9855654ba9c375a44b19aea1f84015bf0e8e1e2cf0523f6d1199fc206fcfa2b37c33a5c019beb635bcd192604d093de5160f157b6977849e06fe6cd6ff93ec94600b0e4d8dc3285a0d8ff5560f8ccb7550d96e0ba5f09ee109cb3a5608be1d10b0293b4fcf9620a382d733fb95fc7bb27315ee27bd5152a3bcf46b1ecb48cf565999f61acd9e3af1e500a767c11bb8c91331de9b049ba8ac20383b847e3fc3bd01ff4a41ff8fe4fda4de0d20fbede93d3d9eac8b15d106038ef3d13f1891bd5586b260b28789f6f1dc8ebd08893b770328cba853b53a8de064edd01fd01e55ea4648af75b659e1505334ed6ad9ace3bc5263e605284f5734b71da1fff6f2f2ecc26cf0c22cda0c2bc52e7fb8e891c7e9d263c52724811f4b9f5d98cfb71e4971a3986c4199294f8b072ab24a93ff00141e46225a8422512093e8dcc6e5cd7df8360a3c5fd1b03fff6066bd2fc9644d73dfc2d2c0cfd929f99e2d069c72f606dd52c7ebab993e3a3b859e71076ee48c3a2eb09a9eb3e87c2e7257f87e7065d781693be686856013a4358b983439c3dab2cd74ae44db3a3cb95b3b2b7dbafe3f640b65d55d072b14a4110a1d3b0f89fcd87b0e84060cc033ffe7b9cc57db87380c0271433a85e1ff596f7fa2f1e17216b97211e3418da48c60aeecd93c8ff260612ef29637462575afcc1545208a18ba42ee525ba62d51fc9fe93d5d1ac7f9de377431cb4fdc4a1ccee45d0739801ddb73641e266fc98f06c65284062e73fdd79c304a578cce29af7d08bd72bc25ffe55cd320614e228322d50e0e5bcd3864b7ebe97c2ed9dc1cf1c55baeb88de7a6a71e93297072b020f41a9061024e5493db5be8b696066c45f158968be986b6c5ce9964d79cdd54bfb25e2a20fb3044824799d3e7328db4705a2c2b47058a018a7c68f6fd09aec9efe4376513b8db4298a2641f40769653ffa7b3a6f026d66fcf1f466efe5cfaf0d27dc566f189807cbbd6c5f4ff03611c24375f8b07139af86d473cae6b4e7775e778c24acbb2ecd8cc3ab5ecaaa49c7b27cdb6835fb814f60b97203358986756ebccea9c6671aee7782ea4b1fd404676227386e737328091a6230e6f297004be3c34a99e3666e5439aa59c98869e1d94000396eaf6167b3cc51b2cbfd05f310550e9a34df958b6ac9a4cd3e4cfcdb20fcdcccd7c6c9efdc6cca31484ab79dd6c99e128cfdf499a60a7cc3c1b5f80b035591e4defe6a9f211a12c67a857d04c96dab394afb39143e8702a92ba922de8856269955ccaa450259d1411a6c78c18fc9dca2cb34449262b92c972a4b403825e383bcfff3a8ef13485d20bec05b409baf28143033e8f7689b3f3320693ff867bdadf1fbd7c31223e439499df93832287d8de544e0a6157fa464526e2fc9d0c369959ef1555792ce2855d8dcf5df8f93579bebdf3827c47afc4941c0939cfaf32cd04ea6fdcf63ac63801070e1652ede67aa2eb4643dfc7d6928aa98f99e50ea904823de26c6a2238bc511e791274c34912f9346cad20b59f4872f81e6f599ebffa895cb87e08a86cad9b789283357294e82bd01d2efc6eab76c42272c13d5fb40e7804e8f4300ae3f380c7b50e8a8c754d41b7326ebe03e65278590aaf8a6122802630df819c21279c85edd8b330c60c918259cf65eb7ccf17c08d174910f06bda3acadf19d31c00a1118d583470c6e59f1df458e459e3911b24e6347685fa9498e91b93924712633a9a339298f947cc4ad4584090262bace4689c8b0014de18e87b62ada4bf093c273297340c71901fa034419588e907b7481b933c27693b8cc401278c2b590aeb63a28536e57a9ab8574c9b71afa804b30f5cd6094898f720426a2f968d7c42230eb40d0088182c4c366070bc73359e0b310f9849c7184f540476ecc2990b4041febb7bd41d33df0b5b7195699772405ab44f4c84c0a5ae0f0643f17b12c8a47bf82f01d5083c398ddc95c6fc2df92d99a0ff1de0c197d141f5b97bc017e418162342a94c7ed0de4a638219ee6989d365d72cf0a680e0da9b25abbb057c2781fd3c2a13722939fe8ae82ac35f73b0a2a3c93b8a9b67a5878e4157a563e40dd091bfa9947f0eedf37717dd93da760c46ed126ef5af21ce87e92918dc6046d1d8cc6a7470943d2fa1523bd025f8562021eb236582a9b00bf041b960a969aba0d3b9e1e1e2f16ff6f8a1293de8a8e8e492eb1e4d1c3437d980c17e7b9730b9709e8fb7c75ff6d7ced136f94d4d0a1cf6b6b399e5904355cf44e2b856010c7a933d1dec0d1d025eff1b0000ffff010000ffffdb9c85bdc79e0000")
 	gr, _ = gzip.NewReader(bytes.NewBuffer(bs))
 	bs, _ = ioutil.ReadAll(gr)
 	Assets["index.html"] = bs
diff --git a/gui/index.html b/gui/index.html
index fee2578bb..a307c2fbf 100644
--- a/gui/index.html
+++ b/gui/index.html
@@ -571,6 +571,7 @@
                   <label translate for="RescanIntervalS">Rescan Interval (s)</label>
                   <input id="RescanIntervalS" class="form-control" type="number" ng-model="tmpOptions.RescanIntervalS">
                 </div>
+                <!--
                 <div class="form-group">
                   <label translate for="ReconnectIntervalS">Reconnect Interval (s)</label>
                   <input id="ReconnectIntervalS" class="form-control" type="number" ng-model="tmpOptions.ReconnectIntervalS">
@@ -583,6 +584,15 @@
                   <label translate for="MaxChangeKbps">Max File Change Rate (KiB/s)</label>
                   <input id="MaxChangeKbps" class="form-control" type="number" ng-model="tmpOptions.MaxChangeKbps">
                 </div>
+                -->
+                <div class="form-group">
+                  <div class="checkbox">
+                    <label>
+                      <span translate>Enable UPnP</span> <input id="UPnPEnabled" type="checkbox" ng-model="tmpOptions.UPnPEnabled">
+                    </label>
+                  </div>
+                </div>
+
                 <div class="form-group">
                   <div class="checkbox">
                     <label>
@@ -602,11 +612,8 @@
                   </div>
                 </div>
                 <div class="form-group">
-                  <div class="checkbox">
-                    <label>
-                      <span translate>Enable UPnP</span> <input id="UPnPEnabled" type="checkbox" ng-model="tmpOptions.UPnPEnabled">
-                    </label>
-                  </div>
+                  <label translate for="GlobalAnnServer">Global Discovery Server</label>
+                  <input ng-disabled="!tmpOptions.GlobalAnnEnabled" id="GlobalAnnServer" class="form-control" type="text" ng-model="tmpOptions.GlobalAnnServer">
                 </div>
               </div>
 
@@ -637,17 +644,6 @@
                     </label>
                   </div>
                 </div>
-
-                <hr/>
-
-                <div class="form-group">
-                  <label><span translate>API Key</span> (<a translate href="http://discourse.syncthing.net/t/v0-8-14-api-keys/335">Usage</a>)</label>
-                  <div class="well well-sm text-monospace">{{tmpGUI.APIKey || "-"}}</div>
-                  <button translate type="button" class="btn btn-sm btn-default" ng-click="setAPIKey(tmpGUI)">Generate</button>
-                </div>
-
-                <hr/>
-
                 <div class="form-group">
                   <div class="checkbox">
                     <label>
@@ -655,6 +651,14 @@
                     </label>
                   </div>
                 </div>
+
+                <hr />
+
+                <div class="form-group">
+                  <label><span translate>API Key</span></label>
+                  <div class="well well-sm text-monospace">{{tmpGUI.APIKey || "-"}}</div>
+                  <button translate type="button" class="btn btn-sm btn-default" ng-click="setAPIKey(tmpGUI)">Generate</button>
+                </div>
               </div>
 
             </div>