More styling & margins on various components