Changed rails version and some style fixes