Changes for styles and dashboard view
deleted tmp
resolve conflicts