Bug 936385 - [music2] Re-layout the whole UI

This patch is cherry-picked from Evan's commit with the reviewed issues addressed and jslint errors fixed.