Resolved some conficts
Button has been removed instead tabs panels are added
resolving conflitcs
Merge branch 'gihantharanga-master'