Refactored code using XML layouts.  Working on meaningful way to use stored data.