Made search dynamic and pretty
Merged master and fix side bar button while doing so