Fixed a css issue (and added a todo)
Merge branch 'development'