labels and layout

Signed-off-by: jsinclair <james@mytcg.net>