fixed bugs caused by styling, should b working now