More responsive work on master view