[Magic-HD] Screen tweak & code clean up