fixed links and simplified
little design edits