UI Small Improvements and WiFly Parsing