Change layout to make it looks better