Add live tile
Refactored stuff