Added more plished look and...

...finaly it works propertly