Cleaned the layout
Shortened links