Cleaned up styles and templates
Added modifers to address