corrected layouts and adapters