Fixed even more layout issues
Tweaked search bar