CSS/HAML Revamp