Reorganize a bit, add expand icon