some changes & styles