Update: Made expansion optional (with buttons).