Fixed text display bug. Button bug still exists. #2