Moving around more stuff, react style helper syntax and better usage