fixed a bunch of weird layout issues
fixed broken var name