Finishing gui adaptation, adding more features
Adding more features & fix bugs