fixing design issues and adding commandLink