made basic layout changes; still buggy and slow