Shift editing

Shift editing is not looking good at the moment


Current view:
![image](https://user-images.githubusercontent.com/21079319/166077754-17ca95d8-aed2-49fd-a3c4-17e4d928f70f.png)


Expected view:
![image](https://user-images.githubusercontent.com/21079319/166077723-bf718bc7-b9aa-43c8-a037-8c31f4b240e5.png)
