created place holders for widgets
Merge Conflict fix