still trying to fix css
merged conflicts