Fix some layout issues, add some labels and fix sorting on chrome