fixed libraries problem, layout polishing