Some fixes
Build
Fix rendering and improvements
Build
Make sure newly created shift won't expire + build