Code Cleaning
Added SearchBar and Index

Plus:
UI Fixes