Cleaned up templates & styles