fixing layouts and syntax