Smoothen up the expanding and contracting; it no longer has a minor hiccup at the end.
Big update to layout, almost done (not with functionality yet)