Added few controls
Some changes to expander and more