Implemented data binding and cleaned up XML