Cleaned up the code and added options that are passed into the displayer.