Sort and display preference options moved into side bar + System options modal completed + Minor bug fixes