Pooja/Ajay | #000 | Removed padding for system variables && more hacks