ADDED: layout modifications