Fixed bugs - looks a lot better