More markup tweaks and post css changes