Fix Bug 956696, align drop down and extend width

@erikrose r? I have tried a bunch of different approaches and this is the closest I came to the ideal. Let me know your thoughts, thanks!