Cleaned up style sheet and related templating