Finished display. Fixed various bugs