DA-70: Refactored the XML layout to use fragments and conform to mock-ups. Added appropriate unit tests for these changes.