Clean up some cruft; Add a couple more CSS helper functions