some changes and some styling