Cleaned up home page plus controllers