Improved collapsable. No 3rd party libs now