Refactor of layout, start work for update to API 21