Refactored as an MVC application. Activities are Controllers, subclassed Layouts are Views and Models are plain Java Objects.