Clean up code, fix issues with margin calculation
Update homework projects