Fix delegate
Code re-factoring
Add text margins properties