Slight margin change
Removed popout icon
Worked on #54 (part 1: sorting)