Move towards simpler and a bit more "responsive" design