Fixed last-minute styling, component naming and file naming code patches