more layout, added libs