fixing design issues and adding commandLink
Merge origin/master