Refactoring
New markup for idea/show
Fix markup
FixMe
bug fixes