Changed ERB files to slim. More bug fixes.