fixing layouts still