General parameters handling fixes

Fixed some extra parameters handling, finalized design for Return Type
panel.