Layout + Bug fix

- Added Icons
- notification improvement
- scene support