Add search bar, some code refactoring, incomplete padding changes