Start to add more stuff & unify design