I like this design much better. Added links... preparing for production branch.