Some changes done for starting working on tabs..