in the process of fixing layouts