Org change, small func change.

Changed Layout and global variable usage a bit