Updated solution to support VS2013 and fixed Tab Order in the UI