A few more tweeks to links and over all view of user.