Fixed some nasty bugs and added better responsive features