fixed prev merge conflict, fixed css, fixed reports index haml