Updated version to more sensible figure
More GUI stuffs