Updated Version

Also fixed a compiling error with ListBoxItems.