fixing link and layout bugs