Updating class diagram and fixing window size calculations