Refactoring!
move foreground into views