Changing the container structure on templates
Adding icon to search bar, changing to a button
Little tweaks