some changes
merged
added new styling