Added sidebar icons, tweaked margins

Also added a sorting option