made final tweaks for now for layout