pebble ui working
merged stuff