Stop url from overflowing, other issues fixed