Fixed some css and todo's and views
 a commit message to explain why this merge is necessary,
f it merges an updated upstream into a topic branch.

ng with '#' will be ignored, and an empty message aborts