layout changed + minor tweaks to role based behaviour