drag fix and some style tweaks