Initial work on the expand button