Works but just looks ugly
Fixed some other stuff