Can now sort by either first or last name

And made som ui changes