Lots of changes to external layout for end-users