Improve layout and add sort function for entries