Add sample input, fix layouts, fix label changes