new design and some global fixes