Cleaned up code, fixed gap with hrefs