Display improvements and cleanup