[Magic-HD] Screen tweak and code clean up.