Added basic dashboard view
Fix problems with whitespace