Merging AnnoucementParsing with master

Minor changes only; messing around with layout padding and text colors and sizes