Convert to cbdrawer & cleanup

Also updated usage of hiccup to newer API