Further cleaned code, and started work on Link View