fixing the layout
fixing layouts