Switched over to HAML. Cleaned up new client interface.