reverted some changes and added some styling