final front end changes
Merge branch 'tweeter'