Simplify/fix product screen

fixes #156