Updated usercontrol

...you really called your update "final"? I still exist here, you know...