Small layout improvemnt