Removed ellipses from xaml
Refactored bounds control