Slight tweaks to user layouts