Fix layouts
Implement ContentProvider for database access