Fixed #119 & #127, Added Register ServiceMatrix button