rebase fixes
about page + cards positions