Commit Fix Layout Bug & Debug Env Variable