Bug fix
Bug fix for version line def
Optimize elements