Optimized live detection & Beautified layout