Improved styling, still doesnt handle extreme cases perfectly though