Added proper X,Y output in debug area, fixed layout, etc.