Added a search function, fixed a small bug with button ID's