work on layouts and icon