Removed some TODO :)
Added template for dashboard