commiting all working version 3. It is few ui bug