Fixed nested control in snippet
Moved modal into separate file