Updated: Fix layouts