Imported old uncommitted changes
Random changes
Fixed &amp; issue on forms
Fixed manifest issue