modified things and some styling