Better design for the WatchApp