Refactored layout home (just uses container layout now)