project page layout fixes, code refactors