Moving some styles and tweaking text