Adding some functionality

Change some of the public method - removing unecessary attribute.
Adding functionality of sub elemnt collapse\expand