search bar home styling in progress
merge comflics fixed