Search Container

Added the Search container and starting the re-structure of the template