styling updates and snagging fixes