Fixed button visibilities etc