Added deeplinks
Optimized layout