Added basic functionalty + solved dropdown issue