Added handling of responsive vs default