diff --git a/README.rst b/README.rst
index 36c8878..41a7f6a 100644
--- a/README.rst
+++ b/README.rst
@@ -2,6 +2,9 @@
JuliaFEM
========
+.. image:: https://raw.githubusercontent.com/JuliaFEM/JuliaFEM.jl/master/docs/logo/JuliaFEMLogo_256x256.png
+ :target: https://github.com/JuliaFEM/JuliaFEM.jl
+
The JuliaFEM project develops open-source software for reliable, scalable, distributed Finite Element Method.
.. image:: https://badges.gitter.im/Join%20Chat.svg
@@ -16,6 +19,8 @@ The JuliaFEM project develops open-source software for reliable, scalable, distr
Documentation: http://www.juliaFEM.org
+GitHub respository: https://github.com/JuliaFEM/JuliaFEM.jl
+
The JuliaFEM software library is a framework that allows for the distributed processing of large Finite Element Models across clusters of computers using simple programming models. It is designed to scale up from single servers to thousands of machines, each offering local computation and storage. The basic design principle is: everything is nonlinear. All physics models are nonlinear from which the linearization are made as a special cases.
@@ -41,15 +46,18 @@ We strongly believe in the test driven development as well as building on top of
`The Zen of Python `_
-| Beautiful is better than ugly.
-| Explicit is better than implicit.
-| Simple is better than complex.
-| Complex is better than complicated.
-| Flat is better than nested.
-| Sparse is better than dense.
-| Readability counts.
-| Errors should never pass silently.
+| Beautiful is better than ugly.
+| Explicit is better than implicit.
+| Simple is better than complex.
+| Complex is better than complicated.
+| Flat is better than nested.
+| Sparse is better than dense.
+| Readability counts.
+| Errors should never pass silently.
+|
+Contributing
+------------
Interested in participating? Please start by reading `CONTRIBUTING.md `_.
diff --git a/docs/README.md b/docs/README.md
deleted file mode 100644
index bc89763..0000000
--- a/docs/README.md
+++ /dev/null
@@ -1,42 +0,0 @@
-
-# JuliaFEM
-
-[](https://gitter.im/JuliaFEM/JuliaFEM?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
-Build Status: [](https://travis-ci.org/JuliaFEM/JuliaFEM.jl)
-
-Code Coverage: [](https://coveralls.io/r/JuliaFEM/JuliaFEM.jl?branch=master)
-
-Documentation: [](https://readthedocs.org/projects/juliafem/?badge=latest)
-
-The JuliaFEM project develops open-source software for reliable, scalable, distributed Finite Element Method.
-
-The JuliaFEM software library is a framework that allows for the distributed processing of large Finite Element Models across clusters of computers using simple programming models. It is designed to scale up from single servers to thousands of machines, each offering local computation and storage. The basic design principle is: everything is nonlinear. All physics models are nonlinear from which the linearization are made as a special cases.
-
-JuliaFEM current status: project planning
-
-Initial road map for JuliaFEM:
-
-version | number of degree of freedom | number of cores
-----------|-----------------------------------------|----------------------
-1.0 | 100 000 000 | 1 000
-2.0 | 1 000 000 000 | 10 000
-3.0 | 10 000 000 000 | 100 000
-
-We strongly believe in the test driven development as well as building on top of previous work. Thus all the new code in this project should be 100% tested. Also other people have wisdom in style as well:
-
-[The Zen of Python](https://www.python.org/dev/peps/pep-0020/)
-```
- Beautiful is better than ugly.
- Explicit is better than implicit.
- Simple is better than complex.
- Complex is better than complicated.
- Flat is better than nested.
- Sparse is better than dense.
- Readability counts.
- Errors should never pass silently.
-```
-
-Interested in participating? Please start by reading [CONTRIBUTING.md](https://github.com/JuliaFEM/JuliaFEM/blob/master/CONTRIBUTING.md).
-
-Contributors: see [contributors](https://github.com/JuliaFEM/JuliaFEM/blob/master/contributors)
diff --git a/docs/assets/build-failing-red.svg b/docs/_static/build-failing-red.svg
similarity index 100%
rename from docs/assets/build-failing-red.svg
rename to docs/_static/build-failing-red.svg
diff --git a/docs/assets/build-passing-brightgreen.svg b/docs/_static/build-passing-brightgreen.svg
similarity index 100%
rename from docs/assets/build-passing-brightgreen.svg
rename to docs/_static/build-passing-brightgreen.svg
diff --git a/docs/assets/build-unknown-lightgrey.svg b/docs/_static/build-unknown-lightgrey.svg
similarity index 100%
rename from docs/assets/build-unknown-lightgrey.svg
rename to docs/_static/build-unknown-lightgrey.svg
diff --git a/docs/conf.py b/docs/conf.py
index e70a833..20a36d4 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -19,8 +19,10 @@ import shlex
import sphinx_rtd_theme
import datetime
-with open("last_updated.rst", "w") as fh:
- fh.write("Documentation last updated (UTC): {0}".format(str(datetime.datetime.utcnow())))
+#with open("last_updated.rst", "w") as fh:
+# fh.write("Documentation last updated (UTC): {0}".format(str(datetime.datetime.utcnow())))
+
+html_last_updated_fmt = "%Y-%m-%d %H:%M:%S"
extensions = ['juliadoc.julia', 'juliadoc.jlhelp']
html_theme_path = [juliadoc.get_theme_dir(), sphinx_rtd_theme.get_html_theme_path()]
diff --git a/docs/index.rst b/docs/index.rst
index 3a532b9..4253a00 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,4 +1,3 @@
-.. include:: last_updated.rst
.. include:: ../README.rst
.. toctree::
diff --git a/docs/tutorials/index.rst b/docs/tutorials/index.rst
index 42323e2..bab0c8d 100644
--- a/docs/tutorials/index.rst
+++ b/docs/tutorials/index.rst
@@ -3,7 +3,7 @@ Tutorials
Tutorials are automatically generated each time new commit is done.
-.. |pass| image:: ../assets/build-passing-brightgreen.svg
+.. |pass| image:: /_static/build-passing-brightgreen.svg
.. include:: notebooks.rst