Minor redisign and small improvements
Minor redisign and small improvements