Fixed crash on most systems & some design changes.