incorporated invisible views and more layout updates