Updated with new changes

1. Need a fix for dropdown
2. Changes are in need for merge

A few bugs introduced, will be resolved in the next commit.
Merged changes

Review changes