finalized search functionality and added some buttons