rearrangement
copy and layout
nag bar background
Merge branch 'streamline'