Put highlight, comment and lock icon on the same line as username

Hand-picked commits from @rawKStar77's branch:

 * 34589679bc82042d6ae8c6c2a3d8e07b50886aba
 * eb7d6f7b431a4cf14bb1ac3418b7e7e769b00f45

This fixes #596 and fulfulls a subtask of #115.