added controller tests; worked on layout