Minor ui tweaks and added search function