Add search and some minor visual tweaks