Fix for select 2 shifting, improvements in the html markup and css layouts.

Reviewer: Dan Jao