Some more styling & content fixes