Made changes for the seperate preview state. Positioning is not entirely working yet.
Made change to unit test, other unit tests have not yet been adjusted completely to take into account the new changes.