Add fontawesome, update layout, modify search bar
More layout fixing
Merge