Second Iteration of Swing Local using more hierarchical view structures and unit modeling