Reduce padding
Remove trailing spaces
Add search ugly but should work