Fix widget navigation
Detect markup types, and add border to help determine padding