more layout & directive changes