Fixed links and added padding and margin