fixed links and some layout stuff