many features and ui changes added