added changes from shaho, HTML version of previous design by shaho.
(previous design was done on play2 framework)