Bug Fixes

Awkwardly placed loading icon on selected -
https://bugtracker.noterik.com/view.php?id=2770