Edited layou for sort buttons and added sorting for all entry fields
except classes