Slight css & markup changes