Improve links and layout