Bug fixes

Various bug fixes for retina display and Windows Phone