switched to fixed layout; minor fixes