Fixed more layout issues