added expander and MVVM UI