Fixes #1270

Removed the offending resource dictionary.
Cleaned up xaml a bit.