Fixed an issue with parameters parsing and improved styles