Removed unecessary references and further improved on the preview design.